Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 20 Jan 2010 14:24:11 +0000 (14:24 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 20 Jan 2010 14:24:11 +0000 (14:24 +0000)

Trivial merge